From: Florian Müllner Date: Thu, 11 Jan 2024 15:22:38 +0000 (+0100) Subject: notificationDaemon: Stop special-casing Empathy X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2~2^2~150 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3f4f74689e11ec06a872835386df3075e9b5ba0a;p=gnome-shell.git notificationDaemon: Stop special-casing Empathy Our telepathy component has been optional for years, and it is disabled by default on major distros, so we cannot assume that it handles any particular notifications. Plus Empathy itself is mostly dead, so it's unlikely to be used much anymore anyway. Part-of: --- diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js index 183279ee9..450989d71 100644 --- a/js/ui/notificationDaemon.js +++ b/js/ui/notificationDaemon.js @@ -146,23 +146,6 @@ class FdoNotificationDaemon { hints = Params.parse(hints, {urgency: Urgency.NORMAL}, true); - // Filter out chat, presence, calls and invitation notifications from - // Empathy, since we handle that information from telepathyClient.js - // - // Note that empathy uses im.received for one to one chats and - // x-empathy.im.mentioned for multi-user, so we're good here - if (appName === 'Empathy' && hints['category'] === 'im.received') { - // Ignore replacesId since we already sent back a - // NotificationClosed for that id. - id = this._nextNotificationId++; - let idleId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => { - this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED); - return GLib.SOURCE_REMOVE; - }); - GLib.Source.set_name_by_id(idleId, '[gnome-shell] this._emitNotificationClosed'); - return invocation.return_value(GLib.Variant.new('(u)', [id])); - } - // Be compatible with the various hints for image data and image path // 'image-data' and 'image-path' are the latest name of these hints, introduced in 1.2